From: Federico Mena Quintero <federico@gnome.org>
Date: Fri, 22 Nov 2019 00:24:32 +0000 (-0600)
Subject: Use get_color_from_term() instead of get_background_color_from_term()
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~781^2^2~349
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=52f5793c9bedbd3400122d51c0eb05571961d899;p=gnome-shell.git

Use get_color_from_term() instead of get_background_color_from_term()

The former already checks for term_is_transparent() as its first
thing.

Part of https://gitlab.gnome.org/GNOME/gnome-shell/issues/1934
---

diff --git a/src/st/st-theme-node.c b/src/st/st-theme-node.c
index 5dc7bc5b6..bd2f21f83 100644
--- a/src/st/st-theme-node.c
+++ b/src/st/st-theme-node.c
@@ -1916,24 +1916,6 @@ st_theme_node_get_max_height (StThemeNode *node)
   return node->max_height;
 }
 
-static GetFromTermResult
-get_background_color_from_term (StThemeNode  *node,
-                                CRTerm       *term,
-                                ClutterColor *color)
-{
-  GetFromTermResult result = get_color_from_term (node, term, color);
-  if (result == VALUE_NOT_FOUND)
-    {
-      if (term_is_transparent (term))
-        {
-          *color = TRANSPARENT_COLOR;
-          return VALUE_FOUND;
-        }
-    }
-
-  return result;
-}
-
 void
 _st_theme_node_ensure_background (StThemeNode *node)
 {
@@ -1978,7 +1960,7 @@ _st_theme_node_ensure_background (StThemeNode *node)
 
           for (term = decl->value; term; term = term->next)
             {
-              GetFromTermResult result = get_background_color_from_term (node, term, &node->background_color);
+              GetFromTermResult result = get_color_from_term (node, term, &node->background_color);
               if (result == VALUE_FOUND)
                 {
                   /* color stored in node->background_color */
@@ -2087,7 +2069,7 @@ _st_theme_node_ensure_background (StThemeNode *node)
           if (decl->value == NULL || decl->value->next != NULL)
             continue;
 
-          result = get_background_color_from_term (node, decl->value, &node->background_color);
+          result = get_color_from_term (node, decl->value, &node->background_color);
           if (result == VALUE_FOUND)
             {
               /* color stored in node->background_color */